From: Florian Müllner <fmuellner@gnome.org>
Date: Fri, 10 Aug 2018 11:34:15 +0000 (+0200)
Subject: build: Don't modify typelib search path in tools
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~929^2~3^2~13
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=dc4128c78be754d16b57c4fe3bf157647b180146;p=gnome-shell.git

build: Don't modify typelib search path in tools

We need this in the main gnome-shell executable in order to locate
the private Shell and St typelibs, but those aren't useful or even
usable in the extension-prefs/portal helper tools.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/192
---

diff --git a/src/gnome-shell-extension-prefs.c b/src/gnome-shell-extension-prefs.c
index 5876121ef..7ff728e1e 100644
--- a/src/gnome-shell-extension-prefs.c
+++ b/src/gnome-shell-extension-prefs.c
@@ -2,7 +2,6 @@
 
 #include "config.h"
 
-#include <girepository.h>
 #include <gjs/gjs.h>
 #include <glib/gi18n.h>
 
@@ -18,8 +17,6 @@ main (int argc, char *argv[])
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
-  g_irepository_prepend_search_path (GNOME_SHELL_PKGLIBDIR);
-
   context = g_object_new (GJS_TYPE_CONTEXT,
                           "search-path", search_path,
                           NULL);
diff --git a/src/gnome-shell-portal-helper.c b/src/gnome-shell-portal-helper.c
index 94eeecb38..a0bebb216 100644
--- a/src/gnome-shell-portal-helper.c
+++ b/src/gnome-shell-portal-helper.c
@@ -2,7 +2,6 @@
 
 #include "config.h"
 
-#include <girepository.h>
 #include <gjs/gjs.h>
 #include <glib/gi18n.h>
 
@@ -18,8 +17,6 @@ main (int argc, char *argv[])
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
-  g_irepository_prepend_search_path (GNOME_SHELL_PKGLIBDIR);
-
   context = g_object_new (GJS_TYPE_CONTEXT,
                           "search-path", search_path,
                           NULL);